Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Loki Prometheus mixin: templatize cluster label #6353

Merged
merged 2 commits into from
Jun 13, 2022
Merged

Loki Prometheus mixin: templatize cluster label #6353

merged 2 commits into from
Jun 13, 2022

Conversation

hervenicol
Copy link
Contributor

What this PR does / why we need it:

Which issue(s) this PR fixes:
Fixes #6352

Special notes for your reviewer:

Checklist

  • Documentation added - not much doc on mixins ATM, I consider the default values in config.libsonnet act as documentation.
  • Tests updated - N/A - only tested with default values, in which case this patch does not change anything in the generated dashboards.
  • Is this an important fix or new feature? Add an entry in the CHANGELOG.md.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/upgrading/_index.md

@hervenicol hervenicol requested a review from a team as a code owner June 9, 2022 14:56
@grafanabot
Copy link
Collaborator

./tools/diff_coverage.sh ../loki-main/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki

Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell.

+           ingester	0%
+        distributor	0%
+            querier	0%
+ querier/queryrange	0%
+               iter	0%
+            storage	0%
+           chunkenc	0%
+              logql	0%
+               loki	0%

@CLAassistant
Copy link

CLAassistant commented Jun 9, 2022

CLA assistant check
All committers have signed the CLA.

Copy link
Contributor

@kavirajk kavirajk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks reasonable. 👍

@kavirajk
Copy link
Contributor

@hervenicol can you do make fmt-jsonnet and commit please? (looks like linter is not happy).

@grafanabot
Copy link
Collaborator

./tools/diff_coverage.sh ../loki-main/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki

Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell.

+           ingester	0%
+        distributor	0.3%
+            querier	0%
+ querier/queryrange	0%
+               iter	0%
+            storage	0%
+           chunkenc	0%
-              logql	-0.4%
+               loki	0%

@hervenicol
Copy link
Contributor Author

can you do make fmt-jsonnet and commit please? (looks like linter is not happy).

Oops. Thanks for the tip @kavirajk , will know for future PRs.
Done ✔️

@kavirajk kavirajk merged commit 459036f into grafana:main Jun 13, 2022
kavirajk added a commit that referenced this pull request Jun 13, 2022
kavirajk added a commit that referenced this pull request Jun 13, 2022
* Revert "Loki Prometheus mixin: templatize cluster label (#6353)"

This reverts commit 459036f.

* Replace `loki-mixin` dependency to working commit.

Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>
dannykopping pushed a commit that referenced this pull request Jun 14, 2022
* fix formating

* re-apply #6353

* promtail-mixin: gitignore vendor/

* promtail-mixin: support for config

* mixins: improve config files

* re-trigger build

Co-authored-by: Herve Nicol <12008875+hervenicol@users.noreply.github.com>
JordanRushing pushed a commit to JordanRushing/loki that referenced this pull request Jun 17, 2022
* Revert "Loki Prometheus mixin: templatize cluster label (grafana#6353)"

This reverts commit 459036f.

* Replace `loki-mixin` dependency to working commit.

Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>
(cherry picked from commit 666bac2)
JordanRushing added a commit that referenced this pull request Jun 17, 2022
* Backport memberlist dependency version pin to k102

Signed-off-by: JordanRushing <rushing.jordan@gmail.com>

* Revert "Loki Prometheus mixin: templatize cluster label" (#6377)

* Revert "Loki Prometheus mixin: templatize cluster label (#6353)"

This reverts commit 459036f.

* Replace `loki-mixin` dependency to working commit.

Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>
(cherry picked from commit 666bac2)

Co-authored-by: Kaviraj Kanagaraj <kavirajkanagaraj@gmail.com>
grafanabot pushed a commit that referenced this pull request Jun 24, 2022
* Backport memberlist dependency version pin to k102

Signed-off-by: JordanRushing <rushing.jordan@gmail.com>

* Revert "Loki Prometheus mixin: templatize cluster label" (#6377)

* Revert "Loki Prometheus mixin: templatize cluster label (#6353)"

This reverts commit 459036f.

* Replace `loki-mixin` dependency to working commit.

Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>
(cherry picked from commit 666bac2)

Co-authored-by: Kaviraj Kanagaraj <kavirajkanagaraj@gmail.com>
(cherry picked from commit 372961d)
vlad-diachenko pushed a commit that referenced this pull request Jun 24, 2022
* Backport memberlist dependency version pin to k102

Signed-off-by: JordanRushing <rushing.jordan@gmail.com>

* Revert "Loki Prometheus mixin: templatize cluster label" (#6377)

* Revert "Loki Prometheus mixin: templatize cluster label (#6353)"

This reverts commit 459036f.

* Replace `loki-mixin` dependency to working commit.

Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>
(cherry picked from commit 666bac2)

Co-authored-by: Kaviraj Kanagaraj <kavirajkanagaraj@gmail.com>
(cherry picked from commit 372961d)

Co-authored-by: JordanRushing <rushing.jordan@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

mixins: templatize cluster label name.
4 participants